From: Gert Wollny <gewo@debian.org>
Date: Tue, 22 Aug 2017 12:45:59 +0000 (+0000)
Subject: d/rules: install examples in arch-indep build
X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~215
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=91d41bdf7f93b5e456df416835ca188c5380a3f6;p=dcmtk.git

d/rules: install examples in arch-indep build
---

diff --git a/debian/changelog b/debian/changelog
index 2c9d36e5..3ff936b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dcmtk (3.6.2-2) unstable; urgency=medium
+
+  * d/rules: install examples in arch-indep build to fix -A build
+
+ -- Gert Wollny <gewo@debian.org>  Tue, 22 Aug 2017 12:46:09 +0000
+
 dcmtk (3.6.2-1) unstable; urgency=medium
 
   * Upload to unstable
diff --git a/debian/dcmtk.examples b/debian/dcmtk.examples
index 31511743..2c44e66e 100644
--- a/debian/dcmtk.examples
+++ b/debian/dcmtk.examples
@@ -1,2 +1,2 @@
-debian/dcmtk/usr/share/dcmtk/wlistdb
-debian/dcmtk/usr/share/dcmtk/wlistqry
+debian/tmp/usr/share/dcmtk/wlistdb
+debian/tmp/usr/share/dcmtk/wlistqry
diff --git a/debian/rules b/debian/rules
index 3b027d57..73fd91c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,11 +52,6 @@ override_dh_auto_build-arch:
 	#$(MAKE) -C obj-* man
 	dh_auto_build
 
-override_dh_installman:
-	LD_LIBRARY_PATH=debian/libdcmtk12/usr/lib/ \
-	help2man --version-string 3.6.2 -n "msgserv: Sample message server for class DVPSIPCClient" --no-info debian/dcmtk/usr/bin/msgserv  > msgserv.1
-	dh_installman msgserv.1
-
 # Let's be smart with building doc
 override_dh_auto_build-indep:
 	$(MAKE) -C obj-* DOXYGEN
@@ -72,6 +67,8 @@ override_dh_auto_install-arch:
 
 override_dh_auto_install-indep:
 	DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/doxygen install 
+	DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/dcmwlm/data install 
+
 
 override_dh_installdocs:
 	dh_installdocs
@@ -84,8 +81,10 @@ override_dh_install-arch:
 	rm ./debian/dcmtk/usr/bin/*_tests
 	rm ./debian/dcmtk/usr/bin/drttest
 	rm ./debian/dcmtk/usr/bin/mkreport
+	rm ./debian/dcmtk/usr/bin/msgserv
 	rm ./debian/dcmtk/usr/bin/wltest
 
+
 get-orig-source:
 	uscan --force-download --verbose --rename